From 1a57cb756df3733254252f4f769893d49c3f58b6 Mon Sep 17 00:00:00 2001 From: "iap10@firebug.cl.cam.ac.uk" Date: Thu, 29 Sep 2005 19:59:18 +0100 Subject: [PATCH] Allow kernel built with privileged operation support (e.g. -xen/-xen0) to be used as a guest kernel on x86_64 Signed-off-by: ian@xensource.com --- linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c index cb0ffc9e51..3a090e24c1 100644 --- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c +++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c @@ -771,11 +771,14 @@ void __init setup_arch(char **cmdline_p) virt_to_mfn(&phys_to_machine_mapping[i]); } HYPERVISOR_shared_info->arch.max_pfn = max_pfn; - - - - + } + if ( ! (xen_start_info->flags & SIF_INITDOMAIN)) + { + acpi_disabled = 1; +#ifdef CONFIG_ACPI_BOOT + acpi_ht = 0; +#endif } #endif -- 2.30.2